diff options
Diffstat (limited to 'fs/nfs_common/nfsacl.c')
| -rw-r--r-- | fs/nfs_common/nfsacl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c index 84c27d69d421..6940439bd609 100644 --- a/fs/nfs_common/nfsacl.c +++ b/fs/nfs_common/nfsacl.c | |||
| @@ -117,7 +117,6 @@ int nfsacl_encode(struct xdr_buf *buf, unsigned int base, struct inode *inode, | |||
| 117 | * invoked in contexts where a memory allocation failure is | 117 | * invoked in contexts where a memory allocation failure is |
| 118 | * fatal. Fortunately this fake ACL is small enough to | 118 | * fatal. Fortunately this fake ACL is small enough to |
| 119 | * construct on the stack. */ | 119 | * construct on the stack. */ |
| 120 | memset(acl2, 0, sizeof(acl2)); | ||
| 121 | posix_acl_init(acl2, 4); | 120 | posix_acl_init(acl2, 4); |
| 122 | 121 | ||
| 123 | /* Insert entries in canonical order: other orders seem | 122 | /* Insert entries in canonical order: other orders seem |
| @@ -174,7 +173,7 @@ xdr_nfsace_decode(struct xdr_array2_desc *desc, void *elem) | |||
| 174 | return -EINVAL; | 173 | return -EINVAL; |
| 175 | break; | 174 | break; |
| 176 | case ACL_MASK: | 175 | case ACL_MASK: |
| 177 | /* Solaris sometimes sets additonal bits in the mask */ | 176 | /* Solaris sometimes sets additional bits in the mask */ |
| 178 | entry->e_perm &= S_IRWXO; | 177 | entry->e_perm &= S_IRWXO; |
| 179 | break; | 178 | break; |
| 180 | default: | 179 | default: |