Rediff for offsets

This commit is contained in:
Andreas Gruenbacher 2007-04-23 01:22:15 +00:00
parent 5a2265661e
commit 2edf5daa20
6 changed files with 6 additions and 6 deletions

View file

@ -63,7 +63,7 @@
--- a/security/apparmor/main.c
+++ b/security/apparmor/main.c
@@ -634,6 +634,23 @@ int aa_perm_dir(struct aa_profile *profi
@@ -664,6 +664,23 @@ int aa_perm_dir(struct aa_profile *profi
AA_CHECK_DIR | AA_CHECK_LEAF);
}

View file

@ -96,7 +96,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
if (IS_ERR(dpacl) && PTR_ERR(dpacl) == -ENODATA)
dpacl = NULL;
else if (IS_ERR(dpacl)) {
@@ -1938,7 +1940,8 @@ nfsd_get_posix_acl(struct svc_fh *fhp, i
@@ -1942,7 +1944,8 @@ nfsd_get_posix_acl(struct svc_fh *fhp, i
return ERR_PTR(-EOPNOTSUPP);
}

View file

@ -67,7 +67,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
mutex_unlock(&nd.dentry->d_inode->i_mutex);
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1534,7 +1534,8 @@ nfsd_link(struct svc_rqst *rqstp, struct
@@ -1536,7 +1536,8 @@ nfsd_link(struct svc_rqst *rqstp, struct
dold = tfhp->fh_dentry;
dest = dold->d_inode;

View file

@ -66,7 +66,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
return rc;
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1532,7 +1532,8 @@ int do_coredump(long signr, int exit_cod
@@ -1536,7 +1536,8 @@ int do_coredump(long signr, int exit_cod
goto close_fail;
if (!file->f_op->write)
goto close_fail;

View file

@ -102,7 +102,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
exit4:
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1628,7 +1628,8 @@ nfsd_rename(struct svc_rqst *rqstp, stru
@@ -1630,7 +1630,8 @@ nfsd_rename(struct svc_rqst *rqstp, stru
host_err = -EPERM;
} else
#endif

View file

@ -68,7 +68,7 @@ Signed-off-by: John Johansen <jjohansen@suse.de>
if (host_error < 0)
goto out_nfserr;
}
@@ -1978,7 +1983,8 @@ nfsd_set_posix_acl(struct svc_fh *fhp, i
@@ -1982,7 +1987,8 @@ nfsd_set_posix_acl(struct svc_fh *fhp, i
size = 0;
if (size)