diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-11-01 12:22:46 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-11-30 10:34:14 -0500 |
commit | b60623c238b6a819bd04090139704e2cb57a751f (patch) | |
tree | fcecc0599003db66d937138be94bef4b4372f15b /fs/gfs2/ops_file.c | |
parent | e7f14f4d094ea1a9ce1953375f5bc1500c760c79 (diff) |
[GFS2] Shrink gfs2_inode (3) - di_mode
This removes the duplicate di_mode field in favour of using the
inode->i_mode field. This saves 4 bytes.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_file.c')
-rw-r--r-- | fs/gfs2/ops_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 7ea417573903..b52b9db1a2bd 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c | |||
@@ -425,7 +425,7 @@ static int gfs2_open(struct inode *inode, struct file *file) | |||
425 | gfs2_assert_warn(GFS2_SB(inode), !file->private_data); | 425 | gfs2_assert_warn(GFS2_SB(inode), !file->private_data); |
426 | file->private_data = fp; | 426 | file->private_data = fp; |
427 | 427 | ||
428 | if (S_ISREG(ip->i_di.di_mode)) { | 428 | if (S_ISREG(ip->i_inode.i_mode)) { |
429 | error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, | 429 | error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, |
430 | &i_gh); | 430 | &i_gh); |
431 | if (error) | 431 | if (error) |
@@ -515,7 +515,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl) | |||
515 | 515 | ||
516 | if (!(fl->fl_flags & FL_POSIX)) | 516 | if (!(fl->fl_flags & FL_POSIX)) |
517 | return -ENOLCK; | 517 | return -ENOLCK; |
518 | if ((ip->i_di.di_mode & (S_ISGID | S_IXGRP)) == S_ISGID) | 518 | if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) |
519 | return -ENOLCK; | 519 | return -ENOLCK; |
520 | 520 | ||
521 | if (sdp->sd_args.ar_localflocks) { | 521 | if (sdp->sd_args.ar_localflocks) { |
@@ -617,7 +617,7 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl) | |||
617 | 617 | ||
618 | if (!(fl->fl_flags & FL_FLOCK)) | 618 | if (!(fl->fl_flags & FL_FLOCK)) |
619 | return -ENOLCK; | 619 | return -ENOLCK; |
620 | if ((ip->i_di.di_mode & (S_ISGID | S_IXGRP)) == S_ISGID) | 620 | if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) |
621 | return -ENOLCK; | 621 | return -ENOLCK; |
622 | 622 | ||
623 | if (sdp->sd_args.ar_localflocks) | 623 | if (sdp->sd_args.ar_localflocks) |