Merge tag 'powerpc-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / fs / orangefs / namei.c

diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index c98bba2dbc94c3547782f7f485bbdd4793d354f4..6e3134e6d98a51c14a7c170ec6b98fdd7b78ff8e 100644 (file)
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -41,7 +41,7 @@ static int orangefs_create(struct inode *dir,
                               ORANGEFS_TYPE_METAFILE, mode);
 
        strncpy(new_op->upcall.req.create.d_name,
-               dentry->d_name.name, ORANGEFS_NAME_MAX);
+               dentry->d_name.name, ORANGEFS_NAME_MAX - 1);
 
        ret = service_operation(new_op, __func__, get_interruptible_flag(dir));
 
@@ -142,7 +142,7 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
        new_op->upcall.req.lookup.parent_refn = parent->refn;
 
        strncpy(new_op->upcall.req.lookup.d_name, dentry->d_name.name,
-               ORANGEFS_NAME_MAX);
+               ORANGEFS_NAME_MAX - 1);
 
        gossip_debug(GOSSIP_NAME_DEBUG,
                     "%s: doing lookup on %s under %pU,%d\n",
@@ -244,7 +244,7 @@ static int orangefs_unlink(struct inode *dir, struct dentry *dentry)
 
        new_op->upcall.req.remove.parent_refn = parent->refn;
        strncpy(new_op->upcall.req.remove.d_name, dentry->d_name.name,
-               ORANGEFS_NAME_MAX);
+               ORANGEFS_NAME_MAX - 1);
 
        ret = service_operation(new_op, "orangefs_unlink",
                                get_interruptible_flag(inode));
@@ -300,8 +300,8 @@ static int orangefs_symlink(struct inode *dir,
 
        strncpy(new_op->upcall.req.sym.entry_name,
                dentry->d_name.name,
-               ORANGEFS_NAME_MAX);
-       strncpy(new_op->upcall.req.sym.target, symname, ORANGEFS_NAME_MAX);
+               ORANGEFS_NAME_MAX - 1);
+       strncpy(new_op->upcall.req.sym.target, symname, ORANGEFS_NAME_MAX - 1);
 
        ret = service_operation(new_op, __func__, get_interruptible_flag(dir));
 
@@ -372,7 +372,7 @@ static int orangefs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
                              ORANGEFS_TYPE_DIRECTORY, mode);
 
        strncpy(new_op->upcall.req.mkdir.d_name,
-               dentry->d_name.name, ORANGEFS_NAME_MAX);
+               dentry->d_name.name, ORANGEFS_NAME_MAX - 1);
 
        ret = service_operation(new_op, __func__, get_interruptible_flag(dir));
 
@@ -453,10 +453,10 @@ static int orangefs_rename(struct inode *old_dir,
 
        strncpy(new_op->upcall.req.rename.d_old_name,
                old_dentry->d_name.name,
-               ORANGEFS_NAME_MAX);
+               ORANGEFS_NAME_MAX - 1);
        strncpy(new_op->upcall.req.rename.d_new_name,
                new_dentry->d_name.name,
-               ORANGEFS_NAME_MAX);
+               ORANGEFS_NAME_MAX - 1);
 
        ret = service_operation(new_op,
                                "orangefs_rename",